Merge from emacs-24; up to r111157
authorGlenn Morris <rgm@gnu.org>
Wed, 9 Jan 2013 08:30:21 +0000 (00:30 -0800)
committerGlenn Morris <rgm@gnu.org>
Wed, 9 Jan 2013 08:30:21 +0000 (00:30 -0800)
commit7f829a2e2683e1daec45e1183b3f708ce5454ae0
tree38f99461b0560af2eda8986a242e8ae046b00384
parente9460ed9a9b08199a792771d0da0a1a2b7f457f8
parent0b8bab2f4ecc18ada5da8e5a89433b1eeba4fddf
Merge from emacs-24; up to r111157
doc/misc/ChangeLog
lisp/ChangeLog
lisp/comint.el
lisp/emacs-lisp/trace.el
lisp/international/mule-cmds.el
lisp/org/ChangeLog
lisp/progmodes/compile.el